Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improvement: S3C-3776 Dockerfile for kubernetes deployment #1448

Open
wants to merge 1 commit into
base: development/7.4
Choose a base branch
from
Open

improvement: S3C-3776 Dockerfile for kubernetes deployment #1448

wants to merge 1 commit into from

Conversation

jonathan-gramain
Copy link
Contributor

@jonathan-gramain jonathan-gramain commented Feb 13, 2021 •
edited
Loading

Add a Dockerfile that will be used by eve to build images suitable for
a dev kubernetes deployment

Note: no impact on branches 8.x

@bert-e
Copy link
Contributor

bert-e commented Feb 13, 2021

Hello jonathan-gramain,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Feb 13, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment with contents from w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment origin/development/8.1
 $ git merge origin/w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment

@jonathan-gramain
improvement: S3C-3776 Dockerfile for kubernetes deployment
915caf1 
Add a Dockerfile that will be used by eve to build images suitable for
a dev kubernetes deployment
@jonathan-gramain jonathan-gramain force-pushed the improvement/S3C-3776-dockerfileForKubeDeployment branch from f6b1730 to 915caf1 Compare February 13, 2021 00:25
@bert-e
Copy link
Contributor

bert-e commented Feb 13, 2021

History mismatch

Merge commit #f6b1730421019c3a79e3d3f87b047ffdb5f0393e on the integration branch
w/7.9/improvement/S3C-3776-dockerfileForKubeDeployment is merging a branch which is neither the current
branch improvement/S3C-3776-dockerfileForKubeDeployment nor the development branch
development/7.9.

It is likely due to a rebase of the branch improvement/S3C-3776-dockerfileForKubeDeployment and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@jonathan-gramain
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented Feb 13, 2021

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e
Copy link
Contributor

bert-e commented Feb 13, 2021

Conflict

A conflict has been raised during the creation of
integration branch w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment with contents from w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment
and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment origin/development/8.1
 $ git merge origin/w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment

This was referenced Feb 13, 2021
Closed
Open
Closed
@bert-e
Copy link
Contributor

bert-e commented Feb 13, 2021

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • stabilization/7.9.0

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e bert-e mentioned this pull request Feb 13, 2021
Closed
@bert-e
Copy link
Contributor

bert-e commented Feb 13, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tcarmet tcarmet tcarmet approved these changes

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jonathan-gramain @bert-e @tcarmet